Merge branch 'release-4.5.0-rc1' into staging
authorIan Jackson <ian.jackson@eu.citrix.com>
Fri, 24 Oct 2014 15:13:11 +0000 (16:13 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 24 Oct 2014 15:13:11 +0000 (16:13 +0100)

Trivial merge